From b170c626c2dcb5dd3bb6ee6c56a22f2843866f4d Mon Sep 17 00:00:00 2001 From: YAMAMOTO Mitsuharu Date: Fri, 9 Nov 2007 08:44:50 +0000 Subject: [PATCH] (face-normalize-spec): Remove function. (frame-set-background-mode): Undo last change. --- lisp/faces.el | 25 +------------------------ 1 file changed, 1 insertion(+), 24 deletions(-) diff --git a/lisp/faces.el b/lisp/faces.el index f22b79e8fc3..ceadb6f764f 100644 --- a/lisp/faces.el +++ b/lisp/faces.el @@ -1505,28 +1505,6 @@ If there is neither a user setting nor a default for FACE, return nil." (get face 'saved-face) (face-default-spec face))) -(defsubst face-normalize-spec (spec) - "Return a normalized face-spec of SPEC." - (let (normalized-spec) - (while spec - (let ((attribute (car spec)) - (value (car (cdr spec)))) - ;; Support some old-style attribute names and values. - (case attribute - (:bold (setq attribute :weight value (if value 'bold 'normal))) - (:italic (setq attribute :slant value (if value 'italic 'normal))) - ((:foreground :background) - ;; Compatibility with 20.x. Some bogus face specs seem to - ;; exist containing things like `:foreground nil'. - (if (null value) (setq value 'unspecified))) - (t (unless (assq attribute face-x-resources) - (setq attribute nil)))) - (when attribute - (push attribute normalized-spec) - (push value normalized-spec))) - (setq spec (cdr (cdr spec)))) - (nreverse normalized-spec))) - ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;;; Frame-type independent color support. @@ -1669,8 +1647,7 @@ according to the `background-mode' and `display-type' frame parameters." ;; be unmodified, so we can avoid consing in the common case. (dolist (face (face-list)) (when (not (face-spec-match-p face - (face-normalize-spec - (face-user-default-spec face)) + (face-user-default-spec face) (selected-frame))) (push face locally-modified-faces))) ;; Now change to the new frame parameters -- 2.30.2